From b61156d4b76d2be3dd91678f31f3237f5b1f35c1 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 14 May 2002 22:44:51 +0000 Subject: [PATCH] Remove the result file on error. (#79929, David Highley) Tue May 14 18:41:58 2002 Owen Taylor * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): Remove the result file on error. (#79929, David Highley) * gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu): If the menu is currently active, cancel it before setting the new menu. (#79162, Jonathan Blandford.) --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gtk/gtkoptionmenu.c | 7 ++++++- gtk/stock-icons/Makefile.am | 30 ++++++++++++++++++------------ 8 files changed, 84 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index b63df4a6fa..dd6db2fe2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue May 14 18:41:58 2002 Owen Taylor + + * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): + Remove the result file on error. (#79929, David + Highley) + + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu): + If the menu is currently active, cancel it before + setting the new menu. (#79162, Jonathan Blandford.) + Tue May 14 18:13:10 2002 Owen Taylor * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b63df4a6fa..dd6db2fe2e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Tue May 14 18:41:58 2002 Owen Taylor + + * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): + Remove the result file on error. (#79929, David + Highley) + + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu): + If the menu is currently active, cancel it before + setting the new menu. (#79162, Jonathan Blandford.) + Tue May 14 18:13:10 2002 Owen Taylor * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b63df4a6fa..dd6db2fe2e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Tue May 14 18:41:58 2002 Owen Taylor + + * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): + Remove the result file on error. (#79929, David + Highley) + + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu): + If the menu is currently active, cancel it before + setting the new menu. (#79162, Jonathan Blandford.) + Tue May 14 18:13:10 2002 Owen Taylor * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b63df4a6fa..dd6db2fe2e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Tue May 14 18:41:58 2002 Owen Taylor + + * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): + Remove the result file on error. (#79929, David + Highley) + + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu): + If the menu is currently active, cancel it before + setting the new menu. (#79162, Jonathan Blandford.) + Tue May 14 18:13:10 2002 Owen Taylor * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b63df4a6fa..dd6db2fe2e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Tue May 14 18:41:58 2002 Owen Taylor + + * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): + Remove the result file on error. (#79929, David + Highley) + + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu): + If the menu is currently active, cancel it before + setting the new menu. (#79162, Jonathan Blandford.) + Tue May 14 18:13:10 2002 Owen Taylor * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b63df4a6fa..dd6db2fe2e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Tue May 14 18:41:58 2002 Owen Taylor + + * gtk/stock-icons/Makefile.am (gtkstockpixbufs.h): + Remove the result file on error. (#79929, David + Highley) + + * gtk/gtkoptionmenu.c (gtk_option_menu_remove_menu): + If the menu is currently active, cancel it before + setting the new menu. (#79162, Jonathan Blandford.) + Tue May 14 18:13:10 2002 Owen Taylor * gdk/x11/gdkdnd-x11.c (gdk_window_cache_filter): Fix diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index 2f45a59507..443a3f4a63 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -295,7 +295,12 @@ gtk_option_menu_remove_menu (GtkOptionMenu *option_menu) g_return_if_fail (GTK_IS_OPTION_MENU (option_menu)); if (option_menu->menu) - gtk_menu_detach (GTK_MENU (option_menu->menu)); + { + if (GTK_MENU_SHELL (option_menu->menu)->active) + g_signal_emit_by_name (option_menu->menu, "cancel", 0); + + gtk_menu_detach (GTK_MENU (option_menu->menu)); + } } void diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 9fa7c2f677..73ba213f49 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -264,17 +264,23 @@ pixbuf_csource=GDK_PIXBUF_MODULEDIR=$(top_builddir)/gdk-pixbuf $(top_builddir)/g endif gtkstockpixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(IMAGES) - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES1) >$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h - $(pixbuf_csource) \ - --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES1) > $(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES2) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES3) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES4) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES5) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) + $(pixbuf_csource) \ + --raw --build-list $(VARIABLES6) >>$(srcdir)/gtkstockpixbufs.h || \ + ( rm -f $(srcdir)/gtkstockpixbufs.h && false ) EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h -- 2.30.2